bitkeeper revision 1.1623.1.1 (429d84f5OmPoNLT2JLLPymMKUCbryQ)
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Wed, 1 Jun 2005 09:50:45 +0000 (09:50 +0000)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Wed, 1 Jun 2005 09:50:45 +0000 (09:50 +0000)
Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk


Trivial merge